merge from trunk

diff --cc src/dispextern.h
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xterm.c
Simple merge